merge in 2013.12.3