Sync'd branch releases/release with upstream @ Tue Sep  9 18:32:30 PDT 2014