merge test_20140802