python-2.7.4 default version
Merge remote-tracking branch 'origin/master'