mikejsavage Merge branch 'jimparis-fix-attributes-master'

Latest commit aca34e3

Mar 18, 2015