Merge branch 'develop' into issue/1258-drop-gingerbread-support
Merge branch 'issue/1258-drop-gingerbread-support' of github.com:wordpress-mobile/WordPress-Android into issue/1258-drop-gingerbread-support