Merge branch 'master' into 3.0

Author: gsherwood

src/Config.php

@@ -323,7 +323,7 @@ public function __construct(array $cliArgs=array(), $dieOnUnknownArg=true)
  $handle = fopen('php://stdin', 'r');
  if (stream_set_blocking($handle, false) === true) {
  $fileContents = '';
- while (($line = fgets(STDIN)) !== false) {
+ while (($line = fgets($handle)) !== false) {
  $fileContents .= $line;
  usleep(10);
  }