Merge branch 'devporter'
hehe
Merge branch 'master' into devporter