Merge remote-tracking branch 'upstream/develop' into issue-2864
authorMichael <heluecht@pirati.ca>
Wed, 7 Jun 2017 18:17:37 +0000 (18:17 +0000)
committerMichael <heluecht@pirati.ca>
Wed, 7 Jun 2017 18:17:37 +0000 (18:17 +0000)
commit5aee2fde1bbbe8ed3ba7f91c5916ff291758ec15
tree2b51534f3c15744048b75b6c559b915e8a557341
parent1b5f1effa0ed7d7774f34ebb199fcbf9e6fd9f4b
parent66458d73135eb7aa93422aac38f54d5ff6e15fda
Merge remote-tracking branch 'upstream/develop' into issue-2864