Initial import of version 2012.1