Merge branch 'master' into JonsBranch
Revert 36d3156..62ce5b7

This rolls back to commit 36d3156c836abada1968f207d6e16412ced3124c.
Merge branch 'JonsBranch'