Forward compatability.
Merge pull request #1025 from cmfcmf/fw-comp

Forward compatability.