Finish uncomplete include magics feature in export
Merge remote-tracking branch 'origin/master' into rails4