Merge branch 'release/1.2.19' v1.2.19
authorLaury GvR <laury@gaslightmedia.com>
Tue, 19 Jan 2016 20:04:45 +0000 (15:04 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 19 Jan 2016 20:04:45 +0000 (15:04 -0500)

Trivial merge