(cherry picked from commit f959b38a89)

(cherry picked from commit fa01194d3c)

(cherry picked from commit f084b72e3a)

(cherry picked from commit 4c2c3d17e2)

(cherry picked from commit 2b140d6f7c)

(cherry picked from commit 8f24f65820)

(cherry picked from commit 8c6df359a5)

Reviewed-on: https://git.trustie.net/jasder/forgeplus/pulls/10

Reviewed-on: https://git.trustie.net/jasder/forgeplus/pulls/9

Reviewed-on: https://git.trustie.net/jasder/forgeplus/pulls/8