Merge updates from sparkfun:master into McNeight:master