spynnaker changes to reflect sergio alan hierarcy discussions.
Merge remote-tracking branch 'origin/master'