Fixed #368. Commented out the wrong pin definition, but explained why it is there.
Merge branch 'upstream/master' into dev