codebase update 20141013