(cherry picked from commit b7e23a62d0)

(cherry picked from commit f3d4f437cb)

(cherry picked from commit efa99e0f06)

(cherry picked from commit e9223c53de)

(cherry picked from commit e7662b66ce)

(cherry picked from commit 36a3e36edb)

(cherry picked from commit 30138cc1fa)

(cherry picked from commit 232f26ea3b)

(cherry picked from commit fa01194d3c)

(cherry picked from commit f084b72e3a)

(cherry picked from commit 4c2c3d17e2)

(cherry picked from commit 2b140d6f7c)

(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