Commits on master

Eric Davis committed
Eric Davis committed
Eric Davis committed
Eric Davis committed