Merge branch 'bug/unsupported_options' into develop
authordrebs <drebs@leap.se>
Thu, 8 Aug 2013 21:48:23 +0000 (23:48 +0200)
committerdrebs <drebs@leap.se>
Thu, 8 Aug 2013 21:48:23 +0000 (23:48 +0200)

Trivial merge