Merged head into master for coding style update

As discussed on IRC :)