Merge branch 'hamed' into brian
authorbdemsky <bdemsky@uci.edu>
Tue, 11 Jul 2017 01:48:32 +0000 (18:48 -0700)
committerbdemsky <bdemsky@uci.edu>
Tue, 11 Jul 2017 01:48:32 +0000 (18:48 -0700)

Trivial merge