20141217 merge