Adding forgotten 1.3 features

I overlooked puppet modules this time, sorry about that. All features/bugs
were taken directly from git, except puppet modules. I hope this is all, if
not please ping me.