Time For A Merge

[qstrahl]

It's been a few months since the last merge back into master; I think it's time. We've got some people waiting on some features, and it's been a week since the last change to develop and I haven't noticed any breakages. Y'all agree?

[utix]

+1

[netei]

+1

[Delapouite]

Absolutely!

[davidchambers]

Sounds good to me.