JvS Update 2.0.6

[changelog='JVS','2.0.6'][/changelog]