Fixed conflicts with #169
Fixed conflicts with #169

constabulary/gb,davidkaya/gb,tbruyelle/gb,ches/gb,hyper-carrot/gb,ches/gb,mopemope/gb,MerlinDMC/gb,hyper-carrot/gb,davidkaya/gb,tianon/gb,acasajus/gb,tianon/gb,mopemope/gb,guiquanz/gb,lparkes/gb,constabulary/gb,constabulary/gb,Luit/gb,URXtech/gb,inconshreveable/gb,inconshreveable/gb,mopemope/gb,tbruyelle/gb