Sync'd branch releases/release with upstream @ Mon Oct 27 14:03:39 PDT 2014