Merge commit '0829e4351dc1518857fd069441bc14df7efd0d67' into 7.x-1.x
Squashed 'modules/base/variable/' content from commit 83c00d0

git-subtree-dir: modules/base/variable
git-subtree-split: 83c00d0daed27175cd8de9134dd047e617bcedf0
Merge commit '9c5b0073984674b046848b82c33dbcb44d564cb2' as 'modules/base/variable'
Merge branch '7.x-1.x' of github.com:drupal-rain/kalaxy into 7.x-1.x