First draft of proposal.
...
Merge branch 'master' into crawler