Merge of dojo 1.9 work