Merge branch 'master' of github.com:HumbleSoftware/Flotr2
Merge branch 'master' of github.com:HumbleSoftware/Flotr2