Updating version.
Merge branch 'master' into openshift

* master:
  Updating version.