Sync'd branch releases/aurora with upstream @ Tue Sep  9 03:01:28 PDT 2014