Sync'd branch releases/aurora with upstream @ Mon Oct  6 12:19:31 PDT 2014