Merge branch 'master' into brian
authorbdemsky <bdemsky@uci.edu>
Tue, 11 Jul 2017 06:07:48 +0000 (23:07 -0700)
committerbdemsky <bdemsky@uci.edu>
Tue, 11 Jul 2017 06:07:48 +0000 (23:07 -0700)

Trivial merge