Merge dev

Update dev with build system and no_ascii changes.