Sync'd branch releases/release with upstream @ Thu Oct 23 19:26:41 PDT 2014