Revert "Revert "20141216 - BEGIN RENEWAL""

This reverts commit 2b24b13e79ed65eaca9e994c49ca87d7856b920b.