Closes #1130 by converting source to string
Merge remote-tracking branch 'upstream/master' into super-admin

* upstream/master:
  Closes #1130 by converting source to string