* 'master' of github.com:yiisoft/yii2: (27 commits)
  Fixed typos
  fixes #995
  Fixed option merging in Console::prompt()
  changed default button style
  typo fix.
  Refactored getModule and hasModule.
  Added intl check to tests, better error reporting, credited Aura.Intl for the most complex test pattern
  Better MessageFormatter tests
  GII sub-modules support - see #871
  Module::getModule and Module::hasModule support for sub-modules - see #983
  removed needFix method
  Removed intl version check since it's very inconsistent and it seems bundled versions are always the same ones for the same PHP versions
  Fixes PHP 5.5 weird placeholder replacememt in case no arguments are provided at all (https://bugs.php.net/bug.php?id=65920).
  changed plural format for BaseListView
  applied new style of Yii::t params to all occurences
  fixed I18N handling of special param values and broken message tags
  adjusted I18N to be consistent with intl message formatting
  improved unit tests for ICU message formatter
  fixed regex for multiline patterns
  intl message parser now handles too many or too less args
  ...