Make static_assert.h more intelligent
Merge commit '0a0ff3a'