Merge remote-tracking branch 'upstream/pr/32' into develop

Conflicts:
	library/src/com/astuetz/viewpager/extensions/PagerSlidingTabStrip.java