pull h2 from doss
Merge branch 'master' into patch1.2.3
Merge pull request #715 from nla/patch1.2.3

Patch1.2.3