Merging all three branches

This is a merge of all three branches.