Merge pull request #170 from funnylookinhat/develop

Final work towards v1.2 milestone.
Fix for system76/beansbooks#172