Work around compiler bug (affected Clang 3.1)
Merge branch 'master' of github.com:otherlab/core