Sync'd branch releases/aurora with upstream @ Mon Oct 27 07:38:39 PDT 2014