misc: merge with sytle checker fix
authorJason Lowe-Power <powerjg@cs.wisc.edu>
Fri, 1 Jul 2016 15:37:57 +0000 (10:37 -0500)
committerJason Lowe-Power <powerjg@cs.wisc.edu>
Fri, 1 Jul 2016 15:37:57 +0000 (10:37 -0500)
Oops.


Trivial merge