Merge branch '2.5.x' into saas

This commit is contained in:
Albert Santoni 2014-12-15 10:50:25 -05:00
commit d5fc90e9d3
10 changed files with 42 additions and 24 deletions