v1.1.0

This is the first release after merging the development branch with master following the 'ours' strategy as detailed in https://stackoverflow.com/questions/2862590/how-to-replace-master-branch-in-git-entirely-from-another-branch

The previous master branch is copied to a new branch called 'old_master'.