Merge to current master

- Had to resolve a trivial conflict

Applies to #654.

That's exactly what I was looking for, thanks!