Sync'd branch releases/aurora with upstream @ Fri Sep  5 11:12:31 PDT 2014