Sync'd branch releases/aurora with upstream @ Mon Oct 13 16:24:38 PDT 2014