Merge f6e8085 from ZeroQI/master