Merge branch 'master' into python2
authoradam <adamansky@gmail.com>
Tue, 28 May 2013 05:45:20 +0000 (12:45 +0700)
committeradam <adamansky@gmail.com>
Tue, 28 May 2013 05:45:20 +0000 (12:45 +0700)

Trivial merge