core.git: Changes to 'feature/caolan-merge26'

[Parth Raiyani (via logerrit)]

New branch 'feature/caolan-merge26' available with the following commits: