Merge: Misc fixes and improvements from WBTW
authorJean Privat <jean@pryen.org>
Mon, 17 Nov 2014 22:55:29 +0000 (17:55 -0500)
committerJean Privat <jean@pryen.org>
Mon, 17 Nov 2014 22:55:29 +0000 (17:55 -0500)
Pull-Request: #915
Reviewed-by: Jean Privat <jean@pryen.org>
Reviewed-by: Lucas Bajolet <r4pass@hotmail.com>


Trivial merge