Merge from gwtbootstrap3 branch into develop