2014-01-06 merge