* Fix for failing code style tests * Changed spacing again and ran the script this time * Merge language string changes from CMS