Merge pull request #342 from jburkle/datadir_check