Fixed compile error for -Wduplicate-decl-specifier on OSX
Merge branch 'master' into otr