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


Trivial merge