Sync'd branch releases/release with upstream @ Thu Sep  4 21:58:40 PDT 2014