branch pull by HW2
local brunch commit
Merge branch '201406121'
master merged from brunch