Fix bug 1088197 - Integrate Makerstrap