Merge branch 'renewal-2014'