14102014 merge