Sync'd branch releases/release with upstream @ Wed Oct 22 12:28:36 PDT 2014