Merged tirejs master