stream_namespace argument might not always be passed. lets get it form the stream
remove $tmp
ci() should be passed
Merge branch '2.3/develop' of github.com:pyrocms/pyrocms into 2.3/develop
Merge branch 'refs/heads/2.3/develop' into 3.0/develop