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