Sync'd branch releases/aurora with upstream @ Mon Sep  8 08:13:33 PDT 2014