Merge branch 'master' into local-fixes
Fixed merge errors.  Updated to Rainmeter RC1 (r2106)

Cleared all C4244 warnings using legal C++
Merge branch 'local-fixes'
Master branch updated with latest changes.

Build testing passed.