Merge branch 'master' into devel
fix trailing whitspace jslint error
Merge branch 'devel'