V61

@jmsnoeij should this branch be merged?