Updated HISTORY.
Updated HISTORY.
Merge branch 'prep-0.6' into develop