Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Tigran Aivazian
2012-09-25 22:04:50 +01:00