Merge pull request #1 from BingHongLi/o51753007

20141025mergetestonebyThomas