Merge branch 'master' into t/mountain-lion

Conflicts:
	OpenMeta.h
	OpenMeta.m
	openmeta/openmeta.xcodeproj/project.pbxproj
[major] update for Maverick