Bug fixes. Getting 'overuse of deferral' warning now.
Merge remote-tracking branch 'origin/master'