t push origin masterMerge branch 'colinnewell-colin/encoding_doc'
John Napiorkowski [Mon, 1 May 2017 14:12:35 +0000 (09:12 -0500)]

Trivial merge