Sync'd branch releases/aurora with upstream @ Tue Sep 30 07:22:34 PDT 2014