Sync'd branch releases/aurora with upstream @ Mon Sep  1 01:56:29 PDT 2014