Formatting of census assistant data
#1219450 - php 5.5 errors
Merge remote-tracking branch 'upstream/master'