ww2.5.2 sync

Hi Peter,  

Pull this into your repo and your version and my version of ww2.5.2 will be synced.