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