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