Merge branch '2.5.x' into saas

This commit is contained in:
Albert Santoni 2015-04-15 16:44:26 -04:00
commit f0bcc1e42b
9 changed files with 200 additions and 339 deletions