Andrew Johnson 7d28ae3732 Merge ioc template changes from 3.15 branch into 3.16

2018-06-05 00:15:22 -05:00

..

base

Merge ioc template changes from 3.15 branch into 3.16

2018-06-05 00:15:22 -05:00

ext

Merged changes from 3.15 branch, to revno 12781

2016-09-07 10:04:54 -05:00