1/18/2014 - Pre-API change merge