Merge branch 'OlafMerkert-master'
authorJohn Kitchin <jkitchin@andrew.cmu.edu>
Tue, 3 Mar 2015 14:50:32 +0000 (09:50 -0500)
committerJohn Kitchin <jkitchin@andrew.cmu.edu>
Tue, 3 Mar 2015 14:50:32 +0000 (09:50 -0500)

Trivial merge