Merge branch 'master' into travis
Henry Van Styn [Fri, 26 Sep 2014 22:03:04 +0000 (18:03 -0400)]

Trivial merge