Initial copy - liberated from http://snaptortoise.com
Merge remote-tracking branch 'origin/master'