Fixed bug that caused old dev data to be badly read.
Merge branch 'test' into dev