Mergefix feature28

Third time's the charm.