merge bradbeattie:master into luismaia:redmine-graphs-plugin