Merge tag 'v1.1.4' into develop
authorLaury GvR <laury@gaslightmedia.com>
Thu, 27 Oct 2016 20:36:45 +0000 (16:36 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 27 Oct 2016 20:36:45 +0000 (16:36 -0400)
commit89fcb89076899d420ecf5cbd70cced6bfd42b6b4
tree540ef65943518072e942d2072e39ee3fbae3bd3a
parentfcd9c875dc69510cb9c3ca6723c91417a02d00ef
parentcb768c49df915607ea0e2ced47736f2d17132485
Merge tag 'v1.1.4' into develop

v1.1.4