Sync'd branch releases/aurora with upstream @ Tue Sep  2 06:04:30 PDT 2014