Bug fix #278
Rollback because it does not work for higher order functions
Bug fix #351
Just for you, Svetlana !
Merge branch 'Upstream/master'
Merge branch 'Upstream/master'