Merging Tool updates into Barometer version

Trying to merge oomphinc:master into practicalparticipation:master

(Might be getting this the wrong way around... please ignore if so...)