merged release/20140828a