Sync'd branch releases/aurora with upstream @ Mon Sep 29 15:26:35 PDT 2014