Sync'd branch releases/aurora with upstream @ Tue Sep 16 06:23:31 PDT 2014