update
Merge branch 'master' into functional_closure_td