Merge branch 'coffeeUpdate' into 1.6.x
Merge branch 'issue684' into 1.6.x
use URLDecoder to ensure that filenames containing spaces are located properly
fix merge conflicts
add missing unit test