Sync'd branch releases/aurora with upstream @ Mon Aug 25 12:57:32 PDT 2014