Merged master and branch
Merge branch 'master' into steve_funding_methods