Changes to base

Changes to base:
commit b62f687e23d90c2ff4536e4e7788e5d9acb2b66c
Author: Gabor Greif <ggreif@gmail.com>
Date:   Sat Jan 4 01:43:27 2014 +0100

    add 'Since' annotations and remove an unneeded import