PR: 19201 Submitted by: Mario Sergio Fujikawa Ferreira <lioux@uol.com.br>
PR: 18673 Submitted by: R Joseph Wright <rjoseph@mammalia.org>