Include npm CLI scripts in the user's PATH - https://trello.com/c/eTwC7UbD/174-support-for-javascript-cli-build-tools-from-npm
Fix the example of erb template
Fix docs typo: `post_install` script references
Bug 1109645 - Fix the wrong path of libmysqlclient for Ruby 1.8
Merge pull request #5539 from mfojtik/bugzilla/1109645

Merged by openshift-bot
Fix docs: `setup' script is optional, not mandatory
Document Cartridge Installation Process
Merge pull request #5419 from ryanj/npm-globals

Merged by openshift-bot
Bug 1112216 - Match specific php module filename

Fix possible prefix/substring bug. Distinguish `foobar.so` vs. `bar.so`.
https://bugzilla.redhat.com/show_bug.cgi?id=1112216

Originally found by @Miciah Masters.
Merge pull request #5537 from VojtechVitek/fix_enable_modules

Merged by openshift-bot
Bug 1111077 - Ensure frontend and state in sync

* When stopping an idled application update http frontend configuration
Merge pull request #5546 from jwhonce/bug/1111077

Merged by openshift-bot
mgmt console: describe SYSLOG_ENABLED option

bug 1112838
https://bugzilla.redhat.com/show_bug.cgi?id=1112838

console.conf should include a description of the (commented-out) option
SYSLOG_ENABLED that's mentioned in the admin guide.
Merge pull request #5547 from sosiouxme/bz1112838

Merged by openshift-bot
Bug 1112522: Getting rid of OPENSHIFT_PHPMYADMIN_LOG_DIR.erb in the gear env/ directory
Merge pull request #5548 from jhadvig/phpmyadmin_erb

Merged by openshift-bot
Revert "Bug 1111077 - Ensure frontend and state in sync"
Merge pull request #5551 from jwhonce/revert-5546-bug/1111077

Merged by openshift-bot
Revert "Bug 1112522: Getting rid of OPENSHIFT_PHPMYADMIN_LOG_DIR.erb in the gear env/ directory"
Merge pull request #5554 from jhadvig/bz_1112522_undo

Merged by openshift-bot