Sync'd branch releases/aurora with upstream @ Tue Sep  2 03:27:31 PDT 2014