Merge branch 'master' into dan_stateless
authorDan Klein <[email protected]>
Tue, 25 Aug 2015 07:23:30 +0000 (10:23 +0300)
committerDan Klein <[email protected]>
Tue, 25 Aug 2015 07:23:30 +0000 (10:23 +0300)

Trivial merge