issue 301: osx debug build error
android: remove -pg flag to avoid link error
Merge remote-tracking branch 'upstream/master'