Merge remote-tracking branch 'alexis/various-fixes'
authorJean Privat <jean@pryen.org>
Wed, 29 Jan 2014 18:08:33 +0000 (13:08 -0500)
committerJean Privat <jean@pryen.org>
Wed, 29 Jan 2014 18:08:33 +0000 (13:08 -0500)

Trivial merge