Sync'd branch releases/aurora with upstream @ Mon Oct 27 15:58:43 PDT 2014