Fix comment to be ignored by uglifier
Merge branch 'dev'