Merge "Reformatted to satisfy PHP_CodeSniffer"