Sync'd branch releases/aurora with upstream @ Mon Oct  6 15:36:41 PDT 2014