Merged in oct13 branch changes for interim Sep 2013 release.