Fix problem with genesis block on osx.
Merge branch 'develop'