bump version
Merge branch 'master' into ntung-closes-fds-fix-2