Merge branch '1.0.1' of /home/kriffer/JHelp/JH with conflicts.
Merge remote-tracking branch 'origin/1.0.1' into 1.0.1
14/06