L-P Merge branch 'update-slim'

Latest commit bdac323

Jun 18, 2016