Merge PLUG-1175 to master

Branch: atlassian-plugins-4.1.x

Branch: master

Merged

#216 · Created 2015-11-25 · Last updated 2015-11-26

Merged pull request

Merged in atlassian-plugins-4.1.x (pull request #216)

7f823fa·Author: Robbie Gates·Closed by: Robbie Gates·2015-11-26

I don't have permission to merge to master, so opening a new PR to roll my changes for PLUG-1175 from 4.1.x brach to master.