Merge tag 'v2.1.0' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 12 Feb 2016 14:18:00 +0000 (09:18 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 12 Feb 2016 14:18:00 +0000 (09:18 -0500)
Versien 2.1.0


Trivial merge