Put changes in reverse chronological order and do some small edits.
Merge branch 'dev' into stable0.6