Merge branch 'hotfix/2.0.3' v2.0.3
authorLaury GvR <laury@gaslightmedia.com>
Tue, 22 Mar 2016 19:40:21 +0000 (15:40 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 22 Mar 2016 19:40:21 +0000 (15:40 -0400)

Trivial merge