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