backport changes
Merge branch 'master' of github.com:Floobits/flux