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