Merge branch 'develop'
xMerge branch 'develop'
Small changes to compile and test under LinuxMint