Merge branch 'master' into renewal-2014