Pin UX changes (bug 842861, bug 848525)
Merge pull request #87 from muffinresearch/pin-ux

Pin UX changes (bug 842861, bug 848525)