Sync'd branch releases/aurora with upstream @ Fri Aug 29 11:50:33 PDT 2014