Merge remote-tracking branch 'upstream/develop' into develop
minor minor improvements
Merge pull request #1211 from conejoninja/uptemp

Uptemp