Merge branch 'hamed'
authorbdemsky <bdemsky@uci.edu>
Thu, 17 Aug 2017 05:17:27 +0000 (22:17 -0700)
committerbdemsky <bdemsky@uci.edu>
Thu, 17 Aug 2017 05:17:27 +0000 (22:17 -0700)

Trivial merge