commit 2014-7-27
Merge branch 'master' into dev