Merge tag 'upstream/0.22' master
authorIan Beckwith <ianb@erislabs.net>
Sat, 28 Nov 2015 02:26:38 +0000 (02:26 +0000)
committerIan Beckwith <ianb@erislabs.net>
Sat, 28 Nov 2015 02:26:38 +0000 (02:26 +0000)
Upstream version 0.22


Trivial merge