Merge branch 'master' into cxml

diff --cc src/picture_asset.cc
Simple merge

diff --cc src/picture_asset.h
Simple merge

diff --cc src/sound_asset.cc
Simple merge

diff --cc src/sound_asset.h
Simple merge

diff --cc wscript
Simple merge