Merge branch 'exp_lpc1'
authorJean-Marc Valin <jmvalin@jmvalin.ca>
Sat, 6 May 2017 17:25:05 +0000 (13:25 -0400)
committerJean-Marc Valin <jmvalin@jmvalin.ca>
Sat, 6 May 2017 17:25:05 +0000 (13:25 -0400)

Trivial merge