Merge tag 'upstream/0.17'
authorIan Beckwith <ianb@erislabs.net>
Sat, 8 Jun 2013 14:28:00 +0000 (15:28 +0100)
committerIan Beckwith <ianb@erislabs.net>
Sat, 8 Jun 2013 14:28:00 +0000 (15:28 +0100)
Upstream version 0.17


Trivial merge