Merge tag 'upstream/0.18'
authorIan Beckwith <ianb@erislabs.net>
Thu, 23 Jan 2014 22:59:49 +0000 (22:59 +0000)
committerIan Beckwith <ianb@erislabs.net>
Thu, 23 Jan 2014 22:59:49 +0000 (22:59 +0000)
Upstream version 0.18


Trivial merge