Merge master to develop with jenkins fix from tim