Merge remote-tracking branch 'upstream/dev' into dev
nape debugging conditional fix
Merge remote-tracking branch 'upstream/dev' into dev
Merge pull request #208 from impaler/dev

Nape debugging conditional fix