Update core.5.
Merge branch '20141021-gzio-refactoring' into markj-develop