Merge "Make getExtensionVersion a little more forward-proof"