Merge branch 'lede-17.01' of ssh://plrg.eecs.uci.edu/home/git/lede into lede-17.01
authorrtrimana <rtrimana@uci.edu>
Mon, 19 Jun 2017 22:02:52 +0000 (15:02 -0700)
committerrtrimana <rtrimana@uci.edu>
Mon, 19 Jun 2017 22:02:52 +0000 (15:02 -0700)

Trivial merge