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