j-mutter/Subliminal — pull request #21 by jules2689 (2014-10-06 19:16:06+00:00)
Title: Master 1.2 develop merge

I think this is okay @j-mutter ... wanna check?

cc @abecevello