Sync'd branch releases/release with upstream @ Mon Oct 20 03:43:35 PDT 2014