Sync'd branch releases/release with upstream @ Thu Oct 30 10:52:30 PDT 2014