[MERGE] boostrap3 manually merged