Merge branch 'release/3.8.1'
Merge branch 'release/3.8.2'

Conflicts:
	WordPress/Classes/ReaderReblogFormView.m
Merge branch 'release/3.8.3'
Merge pull request #606 from wordpress-mobile/release/3.8.4

Moving Release/3.8.4 into Master
#457 - Fixed failure with unregistering push notifications (fixed in develop)
Merge pull request #766 from wordpress-mobile/release/3.8.5

Merging release/3.8.5 into master
Don't relayout reader views with delay

For some reason, Core Text was giving infinite height to the line
containing the placeholder for a youtube video.

Setting a longer delay also fixed it, but since everything else seems to
work I removed the relayout code.

Fixes #655 for 3.8.6
Revert "Don't relayout reader views with delay"

This reverts commit e85ee60953b66d8d0d2b9733734b584d44f7277a.
Fixes a divide by zero error when laying out videos in the reader detail.
Merge pull request #866 from wordpress-mobile/release/3.8.6-fix-video-crash

Release/3.8.6 fix video crash
Bumping to version 3.8.6
Merge pull request #973 from wordpress-mobile/release/3.8.6

Merging release/3.8.6 into master
Merge branch 'release/3.9.1'

Conflicts:
	WordPress/Classes/ReaderMediaView.h
	WordPress/Classes/ReaderMediaView.m
	WordPress/Info-beta.plist
	WordPress/Info.plist
	WordPress/WordPress-Internal-Info.plist
	WordPress/WordPressApi/WordPressComApi.m
Merge tag '4.0' into master
Merge branch 'origin/release/4.0.2' into master
Merge pull request #1749 from wordpress-mobile/release/4.0.3

Merge release/4.0.3 into master
Merge pull request #1801 from wordpress-mobile/release/4.1.0

Merge release/4.1.0 into master
Merge pull request #1836 from wordpress-mobile/release/4.1.2

Merge release/4.1.2 into master
Merge pull request #1849 from wordpress-mobile/release/4.1.3

Merge release/4.1.3 into master
Merge remote-tracking branch 'upstream/master' into develop