Sync'd branch releases/aurora with upstream @ Mon Sep  1 13:10:30 PDT 2014