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