Did martial law ever end?