Merge branch 'dev'

Conflicts:
	aggressive-indent.el

diff --cc aggressive-indent.el
index b3ca3d4937aed16d275fe136004787db585178a4,0c6df3625b9eb9d9df6aa01dfcc8fc9cf89c23e5..ac3afee3abbba84dc9d25caa67a971826c328b81
--- 1/aggressive-indent.el
--- 2/aggressive-indent.el
+++ b/aggressive-indent.el
@@@ -155,12 -165,8 +161,12 @@@ Throw an error if parentheses are unbal
          (add-hook 'post-command-hook #'-softly-indent-defun nil 'local))
      (remove-hook 'post-command-hook #'-softly-indent-defun 'local)))
  
 +:autoload
 +(define-globalized-minor-mode global-aggressive-indent-mode
 +  mode mode)
 +
  :autoload
- (defalias #'aggressive-indent-global-mode
+ (defalias 'aggressive-indent-global-mode 
    #'global-aggressive-indent-mode)
  )