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