Sync'd branch releases/release with upstream @ Thu Oct 30 16:57:41 PDT 2014