Update 2013.06.12
merged from vinh