Merge branch 'master' of github.com:mono/mono
authorAtsushi Eno <atsushieno@gmail.com>
Fri, 20 Feb 2015 19:35:57 +0000 (03:35 +0800)
committerAtsushi Eno <atsushieno@gmail.com>
Fri, 20 Feb 2015 19:35:57 +0000 (03:35 +0800)
(some commits occurred while I have been cherry-picking a lot of "they are
in import-system-xml branch but it works with existing sys.xml" stuff.)
work in master


Trivial merge