Updated
Merge branch 'master' into pull_shilin-he_20140327131650699