Sync'd branch releases/aurora with upstream @ Wed Oct 15 12:59:42 PDT 2014