Revision 5b925223941cc04f36128c2262705089ef98f4a8

Committed on 26/08/2015 2:54 am by ekked <coolscreen@gmail.com> [GitHub Diff]

Merge remote-tracking branch 'origin/master'