Sync'd branch releases/aurora with upstream @ Fri Sep  5 07:19:32 PDT 2014