Sync'd branch releases/aurora with upstream @ Mon Oct  6 16:53:36 PDT 2014