Sync'd branch releases/aurora with upstream @ Wed Sep 10 16:21:36 PDT 2014