Sync'd branch releases/release with upstream @ Tue Aug 26 12:26:32 PDT 2014