Merging Release 2014-01-21

Just going to verify tests don't break before merging.