Merged all changes from develop
Fix jenkins build errors due to version bump
Merge pull request #1270 from timlinux/master

Fix jenkins build errors due to version bump
Merge pull request #1271 from AIFDR/master

Merge master to develop with jenkins fix from tim