Fixed compilation error due to broken comment.

Version bump.
Merge remote-tracking branch 'origin/master'