Hopefully cleaner patch.
Merge branch 'master' into HEAD