PhilippBehmer/fbctf-updated

Merged with upstream master

HackNOASSERTION