Update reflux
Merge branch 'master' into make

Updates reflux.