Did some stuff.
Merge branch 'master' into adam