am d32dd294: am b86675f1: am f2c5a9ee: (-s ours) am b9efa1e5: am 14a4e69c: am...

am d32dd294: am b86675f1: am f2c5a9ee: (-s ours) am b9efa1e5: am 14a4e69c: am c7351974: (-s ours) am a3966c66: am 62743940: am 8c71ff29: am 87234e85: am 9c48ab82: am ccf7b2aa: am 5af7324a: Fix style resolution for styles with \'.\' [DO NOT MERGE]

* commit 'd32dd294':
  Fix style resolution for styles with '.' [DO NOT MERGE]