Framework update from 201312 - 201314.

Bug fixes in progress.
Versioning