Sync'd branch releases/aurora with upstream @ Mon Oct 27 13:59:01 PDT 2014