Merge: After new loader
authorJean Privat <jean@pryen.org>
Fri, 28 Aug 2015 20:37:08 +0000 (16:37 -0400)
committerJean Privat <jean@pryen.org>
Fri, 28 Aug 2015 20:37:08 +0000 (16:37 -0400)
Some cleanup since the new loader landed (cf. #1654)

Pull-Request: #1668
Reviewed-by: Alexis Laferrière <alexis.laf@xymus.net>
Reviewed-by: Lucas Bajolet <r4pass@hotmail.com>


Trivial merge