Feature #909
Merge branch '1.3.x' of github.com:livinglab/openlab into 1.3.x