Merge "Fixed some TextField logging macros" into devel/master