Merge tag 'v1.2.9' into develop
authorLaury GvR <laury@gaslightmedia.com>
Thu, 19 Nov 2015 17:29:26 +0000 (12:29 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 19 Nov 2015 17:29:26 +0000 (12:29 -0500)
v1.2.9


Trivial merge