#23: Resolve merge conflict re: tag verison
Merge branch 'master' into 14.04