I edited the commit to use the single line comment syntax here.

Since the PR was one month old, I also rebased the commits on dev-3.x and built the files with the latest version of shifter.