Merged from trunk -r15118:15121

   Merged from trunk -r15118:15121

   | 15119   | Fix the assert alias to 'value to great for base' messages   |
   | zmedico | in some cases. Thanks to Jonathan Callen <abcd@g.o> for      |
   |         | reporting.                                                   |

   | 15120   | Revert previous commit because it's no comptible (doesn't    |
   | zmedico | pass arguments to die).                                      |

   | 15121   | Fix the assert alias to avoid 'value to great for base'      |
   | zmedico | messages in some cases. Thanks to Jonathan Callen <abcd@g.o> |
   |         | for reporting.                                               |

svn path=/main/branches/prefix/; revision=15123