Merge tag 'v1.2.0' into develop
authorChuck Scott <cscott@gaslightmedia.com>
Wed, 22 Feb 2017 19:29:50 +0000 (14:29 -0500)
committerChuck Scott <cscott@gaslightmedia.com>
Wed, 22 Feb 2017 19:29:50 +0000 (14:29 -0500)
Update to 1.2.0


Trivial merge