Sync'd branch releases/release with upstream @ Wed Sep 10 20:18:31 PDT 2014