set @column in render_field_inplace
Merge remote-tracking branch 'upstream/master'