Commit 04bb7a665dd7e9d1bc4d18f40e46889a9dea6e40

Brent Cook 2014-10-15T22:28:34

update with 2.1.1 changes ok beck@