Increase package version and library revision.
Merge branch 'master' into development

Pull versioning fix into development branch