merged some changes back for the GH-1256 bug
merged some changes back for the GH-1256 bug

JasperFx/Marten,ericgreenmix/marten,mdissel/Marten,ericgreenmix/marten,mdissel/Marten,mysticmind/marten,ericgreenmix/marten,mysticmind/marten,JasperFx/Marten,mysticmind/marten,mysticmind/marten,ericgreenmix/marten,JasperFx/Marten