codebase update 20140815