Fixed issue #1451
Fix issue #1456
Merge branch 'master' of https://github.com/molgenis/molgenis
Revert to 700
Merge pull request #1469 from erwinwinder/master

Fixed issue #1451