Merge tag 'v2.1.4' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 15 Jun 2016 20:35:23 +0000 (16:35 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 15 Jun 2016 20:35:23 +0000 (16:35 -0400)
commit7d770404119503df107ca1b237d33ba28c61a37c
tree0dc1cbdebce0741fd214921eb1c8491a43d6ae99
parentefe04f20a9be02a1efcbd153f2f50d63b7cfbecf
parent8957675931b67164552836b7f820754cc226dbd2
Merge tag 'v2.1.4' into develop

Version 2.1.4