federation iteration
fed 2
merge
Merge remote-tracking branch 'upstream/master'
federation iteration 1 complete
Merge pull request #553 from patriot1burke/master

Federation iteration 1