paradoxical package naming
Merge remote-tracking branch 'marius/16' into protected_thrift_type