Sync'd branch releases/aurora with upstream @ Wed Oct  8 08:26:35 PDT 2014