Sync'd branch releases/aurora with upstream @ Mon Sep 15 12:03:36 PDT 2014