codebase update 20141015