Pull in latest marcuscom ports from branches/GNOME_3_12