Merge with head.
authorJoe Marshall <jmarshall@alum.mit.edu>
Mon, 6 Jul 2015 16:54:33 +0000 (09:54 -0700)
committerJoe Marshall <jmarshall@alum.mit.edu>
Mon, 6 Jul 2015 16:54:33 +0000 (09:54 -0700)

Trivial merge