merge trunk into creole branch