[Templates] Patch: Fix problem treating single objects as lists of objects

[Jess Robinson]

  This message is in MIME format.  The first part should be readable text,
  while the remaining parts are likely unreadable without MIME-aware tools.

---1463811542-833018721-1164066275=:7045
Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed


I got bored.. this fixes it for me, albiet only probably one part of the 
underlying problem. I also didn't fix the XS side since I've no clue how 
that works. Test included.

Jess

---1463811542-833018721-1164066275=:7045
Content-Type: TEXT/plain; charset=US-ASCII; name=TT-2.15-Stash.diff
Content-Transfer-Encoding: BASE64
Content-ID: <Pine.LNX.4.64.0611202344350.7045@insel>
Content-Description: 
Content-Disposition: attachment; filename=TT-2.15-Stash.diff

SW5kZXg6IHQvc3Rhc2gudA0KPT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQ0KUkNT
IGZpbGU6IC90ZW1wbGF0ZS10b29sa2l0L1RlbXBsYXRlMi90L3N0YXNoLnQs
dg0KcmV0cmlldmluZyByZXZpc2lvbiAyLjE4DQpkaWZmIC11IC1yMi4xOCBz
dGFzaC50DQotLS0gdC9zdGFzaC50CTIwMDYvMDUvMzAgMDg6MjE6NTgJMi4x
OA0KKysrIHQvc3Rhc2gudAkyMDA2LzExLzIwIDIzOjQyOjMwDQpAQCAtNjMs
NiArNjMsNyBAQA0KICAgICAgICAgICAgIGJpeiA9PiAoc2hpZnQgfHwgJzx1
bmRlZj4nKSwNCiAgICAgICAgIH07DQogICAgIH0sDQorICAgIGJvcCA9PiBz
dWIgeyByZXR1cm4gKCBibGVzcyAoeyBuYW1lID0+ICdhbiBvYmplY3QnIH0s
ICdBbk9iamVjdCcpICkgfSwgDQogICAgIG9iaiA9PiBibGVzcyh7DQogICAg
ICAgICBuYW1lID0+ICdhbiBvYmplY3QnLA0KICAgICB9LCAnQW5PYmplY3Qn
KSwNCkBAIC0yNDEsNiArMjQyLDExIEBADQogDQogLS0gdGVzdCAtLQ0KIFsl
IG9iai5pdGVtcy4xICVdDQorLS0gZXhwZWN0IC0tDQorYW4gb2JqZWN0DQor
DQorLS0gdGVzdCAtLQ0KK1slIGJvcC5maXJzdC5uYW1lICVdDQogLS0gZXhw
ZWN0IC0tDQogYW4gb2JqZWN0DQogDQpJbmRleDogbGliL1RlbXBsYXRlL1N0
YXNoLnBtDQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09DQpSQ1MgZmlsZTogL3Rl
bXBsYXRlLXRvb2xraXQvVGVtcGxhdGUyL2xpYi9UZW1wbGF0ZS9TdGFzaC5w
bSx2DQpyZXRyaWV2aW5nIHJldmlzaW9uIDIuMTA1DQpkaWZmIC11IC1yMi4x
MDUgU3Rhc2gucG0NCi0tLSBsaWIvVGVtcGxhdGUvU3Rhc2gucG0JMjAwNi8w
NS8zMCAxNzowMToyOQkyLjEwNQ0KKysrIGxpYi9UZW1wbGF0ZS9TdGFzaC5w
bQkyMDA2LzExLzIwIDIzOjQyOjMxDQpAQCAtNDUxLDcgKzQ1MSw3IEBADQog
ICAgICAgICAjIElmIHRoYXQgZmFpbHMgdGhlbiB3ZSB0cnkgdG8gZmFsbGJh
Y2sgb24gSEFTSCBiZWhhdmlvdXIgaWYgDQogICAgICAgICAjIHBvc3NpYmxl
Lg0KICAgICAgICAgZXZhbCB7IEByZXN1bHQgPSAkcm9vdC0+JGl0ZW0oQCRh
cmdzKTsgfTsgICAgICAgDQotICAgICAgICANCisNCiAgICAgICAgIGlmICgk
QCkgew0KICAgICAgICAgICAgICMgdGVtcG9yYXJ5IGhhY2sgLSByZXF1aXJl
ZCB0byBwcm9wb2dhdGUgZXJyb3JzIHRocm93bg0KICAgICAgICAgICAgICMg
Ynkgdmlld3M7IGlmICRAIGlzIGEgcmVmIChlLmcuIFRlbXBsYXRlOjpFeGNl
cHRpb24NCkBAIC00NTksNyArNDU5LDcgQEANCiAgICAgICAgICAgICAjIHJl
YWwgdGhyb3dpbmcNCiANCiAgICAgICAgICAgICBteSAkY2xhc3MgPSByZWYo
JHJvb3QpIHx8ICRyb290Ow0KLSAgICAgICAgICAgIGRpZSAkQCBpZiByZWYo
JEApIHx8ICgkQCAhfiAvQ2FuJ3QgbG9jYXRlIG9iamVjdCBtZXRob2QgIlxR
JGl0ZW1cRSIgdmlhIHBhY2thZ2UgIlxRJGNsYXNzXEUiLyk7DQorICAgICAg
ICAgICAgZGllICRAIGlmIHJlZigkQCkgfHwgKCRAICF+IC9DYW5cJ3QgbG9j
YXRlIG9iamVjdCBtZXRob2QgIlxRJGl0ZW1cRSIgdmlhIHBhY2thZ2UgIlxR
JGNsYXNzXEUiLyk7DQogDQogICAgICAgICAgICAgIyBmYWlsZWQgdG8gY2Fs
bCBvYmplY3QgbWV0aG9kLCBzbyB0cnkgc29tZSBmYWxsYmFja3MNCiAgICAg
ICAgICAgICBpZiAoVU5JVkVSU0FMOjppc2EoJHJvb3QsICdIQVNIJykgKSB7
DQpAQCAtNDY5LDYgKzQ2OSw5IEBADQogICAgICAgICAgICAgICAgIH0NCiAg
ICAgICAgICAgICAgICAgZWxzaWYgKCR2YWx1ZSA9ICRIQVNIX09QUy0+eyAk
aXRlbSB9KSB7DQogICAgICAgICAgICAgICAgICAgICBAcmVzdWx0ID0gJiR2
YWx1ZSgkcm9vdCwgQCRhcmdzKTsNCisgICAgICAgICAgICAgICAgfQ0KKyAg
ICAgICAgICAgICAgICBlbHNpZiAoJHZhbHVlID0gJExJU1RfT1BTLT57ICRp
dGVtIH0pIHsNCisgICAgICAgICAgICAgICAgICAgIEByZXN1bHQgPSAmJHZh
bHVlKFskcm9vdF0sIEAkYXJncyk7DQogICAgICAgICAgICAgICAgIH0NCiAg
ICAgICAgICAgICB9DQogICAgICAgICAgICAgZWxzaWYgKFVOSVZFUlNBTDo6
aXNhKCRyb290LCAnQVJSQVknKSApIHsNCg==

---1463811542-833018721-1164066275=:7045--