Sync'd branch releases/release with upstream @ Mon Oct 20 08:04:41 PDT 2014