7.x 1.x

New pull request... Hopefully I won't close that one!