Sync'd branch releases/release with upstream @ Wed Oct 29 10:08:30 PDT 2014