Merge remote-tracking branch 'origin/master'
authorDan Klein <[email protected]>
Thu, 22 Oct 2015 06:07:45 +0000 (09:07 +0300)
committerDan Klein <[email protected]>
Thu, 22 Oct 2015 06:07:45 +0000 (09:07 +0300)

Trivial merge