Merge of "modules/custom/branches/1.2.x@16514" to "modules/custom/branches/1.3.x@16504". Conflicts:
20 Jan 17 Alex 16520
Got a suggestion or an issue? Discuss it on the Atlassian Community or visit Atlassian Support for other options.