Merge master with rudeog fork

First time I try merging... let's hope it works out.