Updated plugin blacklist.
Give timers more accuracy.
Merge remote-tracking branch 'upstream/master'