Sync'd branch releases/aurora with upstream @ Wed Sep 24 14:06:36 PDT 2014