Revision 5dfa8ec129b3e8f8996c5df5c5f249fee00d65e4

Committed on 25/08/2015 6:38 am by jan <jan@jan-desktop> [GitHub Diff]

Merge origin/master