Merged 2.5.x into saas

This commit is contained in:
Duncan Sommerville 2015-04-27 14:01:28 -04:00
commit 574fdf4b27
15 changed files with 4749 additions and 1186 deletions