v1.1rc6 - system76/beansbooks#123 system76/beansbooks#130
Merge pull request #131 from funnylookinhat/develop

v1.1rc6 - system76/beansbooks#123 system76/beansbooks#130