Merge DEV source into GENERAL source.

Because I forgot to do this earlier.