ehanley commit

Request to merge this branch, into MASTER.