merged with recent commits.
authorNilay Vaish <nilay@cs.wisc.edu>
Thu, 3 Sep 2015 20:40:20 +0000 (15:40 -0500)
committerNilay Vaish <nilay@cs.wisc.edu>
Thu, 3 Sep 2015 20:40:20 +0000 (15:40 -0500)

Trivial merge