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