Update against master

[david4096]

There have been changes in master that will need to be reflected in your code before it can be reviewed/accepted. When you've reached a stopping point update your work against brca-website master using git fetch --all git merge upstream/master.