Sync'd branch releases/aurora with upstream @ Wed Sep 17 18:38:36 PDT 2014