Issue #2379647 by __cj, bleen18: Fix rendering this tag without javascript option not working
Fixing typo in comment
Issue #2379649 by __cj: Short Tag - Remove closing img tag
Issue #2380059 by ishmael-sanchez: Fix for block link
Issue #2379487 by Schoonzie: Add 'force header' flag to slot
Issue #2012092 by evanjenkins, tom friedhof: Custom Content Type - (Panel Pane)
Merge branch '7.x-1.x' into 22633_async

* 7.x-1.x:
  Issue #2012092 by evanjenkins, tom friedhof: Custom Content Type - (Panel Pane)
  Issue #2379487 by Schoonzie: Add 'force header' flag to slot
  Issue #2380059 by ishmael-sanchez: Fix for block link
  Issue #2379649 by __cj: Short Tag - Remove closing img tag
  Fixing typo in comment
  Issue #2379647 by __cj, bleen18: Fix rendering this tag without javascript option not working