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