Merge in the latest commits from devel for Barteguiden V0.2