Sync'd branch releases/aurora with upstream @ Tue Sep  9 02:58:30 PDT 2014