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