Squash those bugs.
Merge branch 'dev'