Sync'd branch releases/aurora with upstream @ Mon Oct 13 19:41:43 PDT 2014