Update from RestKit/Master