Sync'd branch releases/aurora with upstream @ Mon Sep 22 08:04:39 PDT 2014