Merge pull request #194 from mneumann/dragonfly_fixes_2016_squashed

Fixed for DragonFly