merge: remote-tracking branch
 - 'origin/0.4' into 0.4
 - Conflicts:	package.json
test(lib): create baboon.spec