Merge branch 'master' into release-1.3
Merge branch 'hotfix-for-disabled-options' into release-1.3
Update version
Build fix for some system which don't provide clock or usleep
Merge branch 'release-1.3'
Merge branch 'master' into develop