Merge branch 'master' into dan_stateless
authorDan Klein <[email protected]>
Mon, 24 Aug 2015 06:28:43 +0000 (09:28 +0300)
committerDan Klein <[email protected]>
Mon, 24 Aug 2015 06:28:43 +0000 (09:28 +0300)

Trivial merge