Retargeted version of #124

This is a duplicate of #124 except that it points at `develop`.