Merge branch 'master' into ancona
John Napiorkowski [Tue, 27 May 2014 15:01:04 +0000 (11:01 -0400)]

Trivial merge