Updated to match amf changes. Repackaging.
3 files changed