merged dojo/master