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