Fixed a bug where array types could get the wrong AsString because of a change of BaseType
Merge remote-tracking branch 'upstream/master'