Ugh, I always seem to forget that 以前 and 以降 and the like are inclusive.