Merge tag 'upstream/0.17'
authorIan Beckwith <ianb@erislabs.net>
Sat, 19 Oct 2013 22:26:45 +0000 (23:26 +0100)
committerIan Beckwith <ianb@erislabs.net>
Sat, 19 Oct 2013 22:26:45 +0000 (23:26 +0100)
Upstream version 0.17


Trivial merge