• Merge branch 'develop' into feature/web-sockets

    @jsignanini
    jsignanini committed Nov 6, 2018
    Loading status checks…
    Verified
    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    GPG key ID: 4AEE18F83AFDEB23 Learn about vigilant mode.
    343a01d