Bug refs #1674: fixed
Merge branch 'master' of github.com:olegsmith/apinet-client