Sync'd branch releases/aurora with upstream @ Mon Oct 20 11:38:38 PDT 2014