Merging CHANGES from 0.3.5
Merging CHANGES from 0.3.5

fifengine/fifengine,gravitystorm/fifengine,Niektory/fifengine,cbeck88/fifengine,cbeck88/fifengine,gravitystorm/fifengine,fifengine/fifengine,cbeck88/fifengine,Niektory/fifengine,Niektory/fifengine,gravitystorm/fifengine,gravitystorm/fifengine,fifengine/fifengine,cbeck88/fifengine