Sync'd branch releases/aurora with upstream @ Mon Oct 13 10:46:43 PDT 2014