Feature/merge master into mpesa

Merge a branch with master into release/cheetah-mpesa so we can then join that one back in master