Sync'd branch releases/aurora with upstream @ Tue Sep 30 13:19:33 PDT 2014