20130827

pull to zerdliu from initial5 20130827