Sync'd branch releases/aurora with upstream @ Tue Aug 26 06:50:33 PDT 2014