Merge branch 'paddatrapper-master'