Pull master to dev

A few misc changes there shouldn't be a problem.