Yet another implementation, relying on a backwards-compatible core API change.
Merge branch 'template-instance-cap-fix' into ami-builder
Merge branch 'ami-builder'
Set version number