Add support for the fixme package.

Fixes: #8868
Add support for todonotes package

Fixes: #7546
Merge remote-tracking branch 'github/build-bot-master' into bleeding-edge-master
2014.08.31-13.00