Merge branch '2.5.x' into saas

This commit is contained in:
Albert Santoni 2015-05-11 11:08:52 -04:00
commit 3d99c423a9
12 changed files with 165 additions and 141 deletions