Syncing with https://github.com/ibm-dojo/delite/pull/89