what was *that*? ece893eb863d6ca36c53354c9d8ff60283f2de7f
merge [3597/branches/0.11]