Fixed compile error for -Wduplicate-decl-specifier on OSX
Merge remote-tracking branch 'upstream/master'