Sync'd branch releases/release with upstream @ Mon Oct 13 23:23:49 PDT 2014