codexa/pictroid — pull request #2 by Joshua-S (2014-04-26 16:18:12+00:00)
Title: Merge master into development branch.

...for hopefully the last time :)