Sync'd branch releases/release with upstream @ Wed Sep 10 14:52:29 PDT 2014