Merge remote-tracking branch 'origin/master' into peter
Merge remote-tracking branch 'origin/peter'
Merge branch 'master' of https://github.com/Vulkanmannen/TheSeekersWayProject