Fixed conflict with spec version
Merge branch 'knservis-master' into release/0.9.13