Merge remote-tracking branch 'alexis/various-fixes'
authorJean Privat <jean@pryen.org>
Thu, 23 Jan 2014 20:34:12 +0000 (15:34 -0500)
committerJean Privat <jean@pryen.org>
Thu, 23 Jan 2014 20:34:12 +0000 (15:34 -0500)

Trivial merge