Resolving merge conflict between master and release

hotfix-2014-08-13 introduced a merge conflict between release and master.  This resolves the conflict.