Merge remote-tracking branch 'upstream/develop' into develop_macosx
Merge branch 'develop_macosx' of github.com:brash99/hcana into develop_macosx
SConstruct type change ...