20140711
Merge branch 'master' of ssh://github.com/guguke/c8309