Merge changes Idd405a2c,I7052da55

* changes:
  ART: Faster type check bitstring initialization.
  Replace TypeStaticIf<> with std::conditional<> (C++11).