Sync'd branch releases/release with upstream @ Thu Sep 11 10:38:53 PDT 2014