Changelog
Code styling : PHPCS 1.4.6
Merge Master/chiba