Merges "develop" into "release-2-2-0". Preparing for FlexSlider 2.2.0.