Successfully merged Parse into iOS master