Merge pull request #1 from 60frames/integration

TEST-3 #reopen reopening
Merge pull request #2 from 60frames/integration

TEST-3 #resolve close this
Merge commit '7f94f61f217caf2717a34ab92810ec29877f0070' into HEAD