Merge branch '141121_test'