Merge branch 'hamed' into brian
authorbdemsky <bdemsky@uci.edu>
Thu, 6 Jul 2017 00:25:17 +0000 (17:25 -0700)
committerbdemsky <bdemsky@uci.edu>
Thu, 6 Jul 2017 00:25:17 +0000 (17:25 -0700)

Trivial merge