Merge pull request #3167 from rrjjvv/variable-typing

Allow variables to be explicitly typed (and enforced)

Author: tonistiigi