Bug 1033408 +shepherd