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