1.9.4 added
Merge branch '1.9.4'