Merge dev

This time with the right target branch: update build system and no_ascii from master.