Merge branch 'master', remote-tracking branch 'origin/master'

* origin/master:
  Adding NPM completion

* master:
Adding "enable assertions" option to maven options