Merge 84982,84983 from trunk. Fix #8754.
------------------------------------------------------------------------ r84982 | jhunold | 2013-07-08 15:11:49 +0200 (Mo, 08 Jul 2013) | 1 line
Fix: correct elif chain ------------------------------------------------------------------------ r84983 | jhunold | 2013-07-08 15:12:18 +0200 (Mo, 08 Jul 2013) | 3 lines
Fix #8754: Add support for upcoming msvc-12.0
Thanks to Lars Viklund for the patch ------------------------------------------------------------------------