Pull request for 20141212 deployment

All changes for 201212 deployment.