Sync'd branch releases/release with upstream @ Wed Sep 17 13:58:43 PDT 2014