Sync'd branch releases/release with upstream @ Thu Oct 23 09:53:32 PDT 2014