merged the recentchanges branch