Fix ETA
Merge remote-tracking branch 'remotes/hexf/master'