Merge branches 'hotfix-2014-chebgui' and 'hotfix-2014b-chebsnake'
Merge branch 'master' into development