Provide explicit instantiations for the sake of clang 6.0 on os/x 10.9
Merge remote-tracking branch 'mitaka/tickets/HSC-1081' into mitaka