Merge pull request #84 from shadlaws/master

#1919 - change `convert -v` to `convert -version`
Automated update of .build_number to 269 for branch master
Last update: dc3fd9d037871a3ac8b28ab859302ee6ceca3844 (1 commits ago)