Bug fixes and Playbook work
Merge remote-tracking branch 'origin/master'
Hopefully fixed all merge issues.