Merge branch 'listjs' of git://github.com/mneuhaus/Plumber into mneuhaus-listjs