Merge branch to trunk

I'm sexy and i know it