Fix fabbot issues
minor #736 Fix fabbot issues (GrahamCampbell)

This PR was merged into the 1.1-dev branch.

Discussion
----------

Fix fabbot issues

Commits
-------

c967a72 Fix fabbot issues