Merge 'pbkdf2' into merge-fixes

Conflicts:
	src/com/hurlant/util/Hex.as
Merge branch 'type2fix' into merge-fixes
Merge branch 'upstreamfixes' into merge-fixes