Sync'd branch releases/aurora with upstream @ Mon Sep 15 06:32:36 PDT 2014