Merge branch 'master' into fixes-20130324