OK then, decision time, which is the main devel branch, 'master' or 'develop'? I need to merge in a few small bugfixes. I vote for 'master', since it's slightly simpler for new devs, with releases being constructed in branches off of that. Rob