If/when this is merged, someone needs to adapt the code to match our coding style for consistency. The violations as pointed out by the Travis CI build (see the link below the pull request).