Merge tag 'v1.2.16' into develop
authorLaury GvR <laury@gaslightmedia.com>
Fri, 11 Dec 2015 19:52:29 +0000 (14:52 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 11 Dec 2015 19:52:29 +0000 (14:52 -0500)
v1.2.26


Trivial merge