Develop

Merge Develop branch into Master. Develop branch contains bug fixes and enhancements from the both Kartoza and GIs Solutions.