Packaging -- retroported from trunk
Silence warning -- retroported from trunk
Hot fix for Windows 64 problem