build both master and develop branches
Merge remote-tracking branch 'upstream/master'
bugFix: removed specific windows platform macros and functions