Sync'd branch releases/aurora with upstream @ Sun Aug 24 12:31:35 PDT 2014