Merge the lasts developathe/wp-boostrap develop changes.