"Code stylin : PHPCS 1.4.6"
Merge branch 'master/chiba' of git://github.com/novius-os/core into master/chiba
Merge branch 'master/chiba' into rel/chiba2