Tweak build for Trusty Tahr
Add declaration of ctap_tests() to calm compilers
Merge remote-tracking branch 'github/master'