Merge branch 'mlx' into merge-test

This commit is contained in:
Doug Ledford 2016-12-14 14:44:25 -05:00
commit 86ef0beaa0
40 changed files with 875 additions and 336 deletions