Squashed 'springside4/' content from commit d582b3d

git-subtree-dir: springside4
git-subtree-split: d582b3df77f4d899f9306628c9fa8ecc61f5e458
Merge commit 'f85792dcd9d82bae4182bd00190788a8b10c8309' as 'springside4'
Squashed 'springside5/' content from commit dc6fbaf

git-subtree-dir: springside5
git-subtree-split: dc6fbafdcee1f787c11d16c36b0f78297c256b61
Merge commit '6c13b78c83cb977e07f4f046daf25964b2891b84' as 'springside5'