Sync'd branch releases/release with upstream @ Wed Sep 17 14:30:27 PDT 2014