Pushing new changes
Pushing new changes
Merge branch 'master' into pull_zhuweid_20130621113820915
Updated