Merge branch 'daywalker/cmake_option_sorting'
authorVasily Pisar <vasily.pisar@jetbrains.com>
Thu, 29 Oct 2015 15:23:15 +0000 (18:23 +0300)
committerVasily Pisar <vasily.pisar@jetbrains.com>
Thu, 29 Oct 2015 15:23:15 +0000 (18:23 +0300)

Trivial merge