• merge commit 

    Conflicts:
	gl2.rs
    @bollu
    bollu committed Jul 18, 2014
    fb7fbd3