Update to 2.3.6

Signed-off-by: Jonathan Bennett <JBennett@incomsystems.biz>