am 8d0dc62f: am ef3f5ddc: Replace "safeMode" with a more specific name...
am 8d0dc62f: am ef3f5ddc: Replace "safeMode" with a more specific name "vmSafeMode" in the public API.
Merge commit '8d0dc62f' into kraken
* commit '8d0dc62f':
Replace "safeMode" with a more specific name "vmSafeMode" in the public API.