Merging from svv.im -> (master) -> (devel)