merge vonfritz:master