Sync'd branch releases/release with upstream @ Tue Sep  9 14:09:41 PDT 2014