Sync'd branch releases/aurora with upstream @ Mon Oct 13 11:21:37 PDT 2014