Backing up current state of prod repo on Dec. 4, 2014
Merge branch 'prod-bak-20141204'