Fixed https://github.com/wordpress-mobile/WordPress-Android/issues/137
Merge branch 'develop' of https://github.com/wordpress-mobile/WordPress-Android into develop