official release 2014/08/17
Merge branch 'master' into convenience