Changeset update 2014-01-30

@fmateoc Cleanup broken history of PR #219