Merge commit '086d88503e589f14560209000724fe5215a10937' * commit '086d88503e589f14560209000724fe5215a10937': Whoops forgot the change to actually check for safe mode!