Merge branch 'stop-using-has_key' into 'master'

Stop using deprecated function has_key()

See merge request !1