Merge branch 'refs/heads/develop'
Merge branch 'refs/heads/develop'
Merge branch 'refs/heads/develop'
Merge branch 'refs/heads/develop'
blockquote

Signed-off-by: Vitek Ulicny <vitek@mohemian.com>
Merge branch 'refs/heads/master' into develop