Changed micros() to work in interrupts
Merge branch 'aaa' into ide-1.5.x

Fixes #1388
Fixes #1301