Merge remote-tracking branch 'upstream/master'
Henry Van Styn [Mon, 12 May 2014 21:37:56 +0000 (17:37 -0400)]

Trivial merge