Make more of the translation attributes optional with reasonable defaults
Merge branch 'daley', remote-tracking branch 'origin'