Update upstream. (Critical fee calculation fix.)
Merge branch 'develop'