Merge with excion/gravityforms-firstdata v1.1

Merge e6d5cc82b7552fc49ac54e9caa5adff9d28f95ee