Merge "Support int uniform in shader" into devel/master