Merge branch '2.5.x' into saas

This commit is contained in:
Albert Santoni 2014-11-14 11:56:01 -05:00
commit 2494e66bb0
29 changed files with 1151 additions and 21 deletions