Zarthus/Reconcile — pull request #47 by Zarthus (2014-11-08 13:40:07+00:00)
Title: Sync development with master.

It's been a while since a release, the changes in `development` appear to be stable, and this merge will update the latest master branch with 1.2-dev. It can be seen as version `1.1.1`.