possible fix to declarations of structs which are similar but declared in contradicting contexts
Merge remote-tracking branch 'origin/master'