Initial fixes
Merge branch '3.4/develop' of github.com:cyrgit/minion into 3.4/develop