Sync'd branch releases/release with upstream @ Wed Oct 29 14:37:33 PDT 2014