Merge 1-4- stable

> 00:49 < zenspider> zzak: meh. imho we should be using master and anything on 1-4-stable not merged over should be