Fix for attribute default expressions.
Merging origin/jbuchanan/master-pending-default-expressions into master