Commit c4d440bf956ef5f3b8bf0274d8443c27fe30f50e

Mark Ellzey 2015-05-11T22:18:54

Merge branch 'master' into 21_size_and_misc_fixes