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